Fix #1566