Fixing edge issue with step token replacement.