Fix best bug yet