Fix having and where methods