Line 621 should also be modified similarly.