Catch #292 Update