Fix #1042 (#1043)

8 files changed