fix defaults in context