Fix #1052