fixes cst-403