BUG: fix type mapping