Fix #1324