Hack to workaround edge-case with uuid