Fixed saveing problem