hopefully fixes cst-403