JAWS Bugfix