Load State Bug fix