Fix #1499.