FIX issue#8147 v4