Fix #1083