Adding support for space before colon