Fixed some buggery