Hi @thalles,
The above patch works for me. Hence moving it to RTBC.
Thanks!