Fixing ace7504064ec35d5 regression