Fix #1516