Fixing clearnace bug