bugfixes with single occupancy