@yuhunglin nice spotting, updated the PR