Updated regex to be consistent with the latest Minerva version.