Making 5.4 compliant