adjusted validations #179