Fix #1038