Fix issues #1529 & #1530
2 files changed