fixed missing checks