TD-3787 Spaces inserted inside square brackets