Fix #2644