Fix #663 (cherry picked from commit 3c232a2429) Co-authored-by: Vladimir Botka <vbotka@gmail.com>
3c232a2429