Sort floors correctly

Don't rely on order of object enumeration