FIX: changed the order of options