fix for CST-336