Fixed a broken regex in both 'engine' and 'cluster' classes