Fix #1117 fix