Updated issue #373: Removed system/file