Fixed singularity, now outputs all primitives