Fixes

Scanner can be reused (Thanks to TPL)