Little upgrade of #39