Changed the check for #3