fixed object/context - context is exposed, however, so clean that up