Fix (pointed by Mozilla) problems