Fixes #66 : replace bad use and variables