This should workaround the firefox navigation issue