prevent conversion unit to loop infinitly
Merge pull request #323 from Etienne13/develop

prevent conversion unit to loop infinitly