Fix #1013