Fix Emy's PR