Fix derp, this is probably what caused the errors before. Oh well, clean code is clean, closes issue #52