fixing check related bug