Additional fix for OPENDJ-1324