Improved the fix
Merge pull request #6 from c9/fix/reuse

Improved the fix