hmm should hopefully fix the last bug