Fix broken by hacking the quilt package. Def need to revisit and clean up code in the future