fixed context scope in dev