Fix #1027