fixed first-order-same-floor-bug