issue #1: fixing validation of sever fields