Rework nfs to fix #4