Fix to don't encode some types