Update #446 - Update RetrieveBaseType to return inner

This was a bug in the original implementation