Fixed stepping issues.