Issue.7146

Solves bug 7146