#256 - validation logic fixes