Closes #7 e10s compatibility