Fixed bug with new CSA. Preparing for final merge into `master`.