Fix #1140