Fix debuggability in FSI
Merge pull request #474 from ovatsus/master

Fix debuggability in FSI