Solve bug #7208
!