Fix return_dict issue
@vinchg could you rebase this PR with main? There was a fix this morning that we need to pass CI. @ericharper Yeah, PR has been rebased!
Signed-off-by: Vincent Cheong <vincentkcheong@gmail.com>