Fixed Context Bug