Catch #222 update