Fixing wierd save state issues
Fixing wierd save state issues