Whistle fix