Context Propocessor fix