Feature/meta hotfix