Fix #5324