Fix #1355