Fix for bug 876
Merge remote-tracking branch 'vorenon/bug876'