fix popcal not properly getting destroyed. new build.