BUG: Add missed filename
BUG: Don't remove keys too early
3.0.1