Fix for JCE-162