Smilies not converted when directly followed by punctuation marks

[ourvalley]

Steps to recreate:

• Create a new post or comment
• Insert a smilie directly followed by a period or other punctuation mark such as :).
• View the post or comment

Expected:

Ideally the smilie would show followed by the punctuation mark.

I've attached a screenshot showing how a post with the following text appears. Smiles with a space between them and the punctuation mark show, but the others do not.

This is a test :). It uses smilies :)

If a smilie has punctuation directly after, it is not converted :(! :(

The expected behavior would be to look like this:
:) ! :) ,
However instead they appear as this
:)! :),