See my other PR