Added a check anyway to make things beautiful