modifed regex to fix issue #61