Fix #2124