Fix #1238