Bugfix: proper handle regexp match