Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
* Ensure unique_id is correctly set * Removed unnec. line Co-authored-by: Tom Scholten <git@scholten.nu>