Fix buglet from reorganization