Update Issue #373: Removed system/fragment, little improved code