Fixing step index in context