Fix #2560