Fixed SOE #SCL-6079 Fixed