Yet another saving bug