Kazu's biggest bug fix ever gad damn it --kazu