Fixup - explicitly add system type to constructor