Fixing #1223 issue.