rework handling of empty space fix