Fix for JCE-259