References fix?