Not losing state of inspector
Merge pull request #809 from wmathurin/unstable

Not losing state of inspector