Jinx E and Q fix

Jinx E and Q fix