Fixed saving bug