fix catch