Fixing Kazu's bug fuck kazu! --David