Added compatability with the old buggy non-saving versions