Fix #2928