Fix #2131