Fix to work with mintiest 5.2.2