can we file this as an issue separately of this PR?