Fix for OPENDJ-1324