BS-9087, fix order