#4523 fix