Added fix for StaleStateException