Fix J/K (thanks @danielmagnussons