Fixing the occupant bug.