Fixed passContext
Rewrite this shit