Fix #1338