removed some wrong checks