Fixed issue with save states