Fix for issue# 10474.