Fix issues #134, #1911
3 files changed