ModJam commit #8