Should fix every-other bug