fix CLNF behaviour