fixed callbacks validations