updated to make it compatible with FF 30.0