Fix #1466