#4547 Change logic.