Fixed: silly type bug that made everything come out wrong!