Should've been part of earlier commit :-\