Fix #2558