Fixed all-Option, all-None bug