Fix #1506