Another bugfix
small code refactoring.
small refactoring to make code more clear.
Fix the crash.
bug fix. We where freeing too early, as the compute map values are list. If they contain any elements they evaluate to true. We want the list element to evaluate to true.