This is the first time when this issue occurred so yeah we will be adding some fallbacks for it