Save behaves a bit more sane