Fix #2916