Shiran Honig

@bo-oz Hi, can you please review and merge this PR? I need this upgrade as well

Hello, Is this fix about to be merged? is there another solution for this problem? Thanks!