0.6.5 broke everything, trying to fix