Fix #2082