Fix #589
7 files changed