more fix on resolve event