No, really this time... make it work for moz too