d&w: merge pull request from bernator by hand :-()