5.3 support fix