Fixing new bug introduced by the latest commit here