Resolved issue #75 (for JK2 only, JKA is slightly different)