fix passing through contexts