Fix for JBPAPP6-812.