Fixed step counter issues