Fixing more choices