Fixes delegate slot save issues
Merge pull request #125 from vishalkal/branch

Fixes delegate slot save issues