Fixes bug in CAD listener