fixed annoying catch