Defaulting to the original type (fixes #25)