Bugfix in Scanner