Fix for regexp
removed debug code