Fixed context issue