Fixing regexp problem