Merge pull request #983 from Viproz/edge-stepperfix