Maybe workaround but it seems to fix handlin CSApprox
Fix condition for CSApprox
Merge branch 'fix/csa' into master