Completed a check that was half done in previous commit.