Fix #2405