Bugfix for Uncaught ReferenceError: Q is not defined Issue #607