Hunt fix

This is the branch for fixing
https://bugzilla.mozilla.org/show_bug.cgi?id=1068952

Not finished, but I want to merge this now at it fix a minor bug.