Fix #1207