Fix #1064