Fix the occupancy concern

Fix the occupancy concern