Hopefully fixed issue with directory filescope