Fix a threading off bug not everything is calc'ed

See title