Fixes #105

Temporary fix for #105, it will solve the issue with nested
wheres, more needs to happen to provide proper functionality