CC @suji spotted an issue here. Could you please take a look?