fix broken #3, reorder 6 and 7