first little tweak @bgamari (have more ill actually do via a proper branch later :) )
merged
mentioned in commit 07014b05