Fix #1255
2 files changed