Removed hook that caused strange behaviour