Fix for column alignment (CONTRIB-4857)