fix 5.4 specific code