Fix #1499