v0.3.5 :: external instance context fix