Fix #1121