BUGFIX: Occupied list was not being handled properly