Added @bouke for bug fix #722. Thanks!