Top word saving fix