Fix #1360