Make the fix for #591 more focused and explain it.