fixed issues from -> operator refactor