fixed validattion before conversion bug
Merge commit '86744b75b52092ce89d5e89383d8159721ced659'