reorder to pass Travis