cleanup CS for fix from #104