Fixed #1124

Remove the punctations as well xD