Backported another derp fix (baly y u so noob today)