Fixed problems with states and userResolve