Improve fast reset

Fix #263