Fix #1494