Merge pull request #1420 from IT-Can/fix-issue-1419

Fix issues #1397, #1419