fix bugs on H2O