Fix #2558
Fix #2560