Fixing behaviour, turned out to recompute to much