Fixing regexp