Bugfix/source of truth