v2.0.1: fix resolve_on_forward