fix for JBPAPP6-1432