6258dc3 fix changes