Fix issues #1476, #1909
2 files changed