bugFix 5.4 #C724