Fix #1097