[BUGFIX] Fix bug with meta data