FIX issue#8147 v5(final?)