alter regex to fix issue #6