CORE-4775 fix space issue