WIP: typespec fix
WIP: typespec fix