Made Compatible with current Firefox Versions