Feature/weakreferencefix