Compatiblity with new Mattock