i guess we need this fix even if we do not merge this PR