Add an issue to consider adding logging here?