fix where()