fix order of build options (again)