Cool, so after this fix, can we merge this PR?