Good TODO, maybe we should file an issue for this?