Temporary fix for a memory leak