Fix CSDL