Added value assignment hack