Fixed mCurrent so that it doesnt point to null (v0.1.5.a22)