fix where bug on the last commit