Fix #1247