Fix #3234