JR Controllers Fix