Add some more comments explaining the why and how of the fix for #595