moving the check. related to #489