removed some incorrect checks