MDL-20929 fixed input validation