Fix #1271