make it better
fix REGEXP