Fix #1014