Fix #1343