Fixed missing checks