Stricter regexp here, too. :)