Fixed and improved regex