Fixed regexp stuff