Merge pull request #1490 from headshog/fix-j2k