Fixed context ussue