Fix another bug - had commented out good code to test something out, commented it back in and everything should work