Fixed validation of options