Fixing a WTF