Fix Issues #160 - Wrong referencing to fs var

Closes #160