[0.7-15] fix for 7.1.*