carls cool bugfix he doesnt want to see upstream because he is more hostile than lennard p. - the actual cool fix will actually be included in the _next_ commit