Fix #5484