Fix #2734