5.3 -> 5.4 compatibility issue fixed