Contextual ConstructFrom fix