Fix #1424