Added a new check but not sure if this is correct.