BUGFIX: key not found on save