Fixed double step bug