Derp #5 - temporary fix till i figure out why my code is so broken :(