Updated to fix issue 456
Merge branch 'hotfix/fix_issue#456'