UD-195: Fixed broken create and import