Fix for Bz #901061 AKA JBPAPP6-1432.