Bugfix round for bad hooks