Fixed: 5.4 compatibility.