Fix where=None bug