Fix #1361