#40 Fix regex