#37 and #38 fix

Same as L131. Or maybe it will be better to put those Regexps (since its the same expression twice) in a function?