Fix #1431
Merge branch 'hotfix/fix_1431'