Fix fast reset race condition

Fixes #662