Fix #186
3 files changed