Fix #5647