Fix goto ordering