FIX: self.keys to @keys