Temporary fix for possible circular reference memory leak.