Fix #1523