Fixed bug with and() not bing correct