This should fix #2467.

Слиты nikitronn запросил слияние fix_2467 в master

Created by: portnov

Addressed problem description

Fix for #2467 (closed).