fixing self instancing