fixup! Make sortable parameter variable instead of static
fixup! Build