validation fixes for #188 and #169 nr.2