Updated to fix firefox