Fix #1545