Bug fix: Escape regexp