fixed bug in and where form could be evaluated twice