Added FF workaround