fixing issue #1 by adding RegEx