Foreign struct type fix