Fixed issues with StringFormat