Optimized and fixed wb-sec-sup support.