Fixing the uglier fix