Fix #1442