Open an issue to track this?