Fix for CA-136654