Fix #1269