Fix multiple options accepted for single-value options (#687)

Fix multiple options accepted for single-value options (#687) #125