Fix #1084