Fix merging mistake (crash in "stairs")