should have been included in commit ade1712