Fix double-save