[#1337] only fix port for 8.4