Fixed bug with context passing