Fix #2585