- fixing validation