Fix #2187