bug fixed, removed weak references