Fix #2033