Added a fix for the where method.