Fix to work on CCL.