Fixing bug with non-persisted badges