Fix where implementation