FIxed problem with saveing