See my merging comment from above