So i'll close this PR and merge the fix