We should open an issue to track this