Catch #235 part 2