:3600 bug due to bad regex, closes: #8