Fix for regexp