Remove where fix for now