bugfix/VOV-1908

Is this good enough or do we need to check if they created it as well?