Should we file an issue for this and reference it?