Fixing CAS works