Fix to the fix to the last commit