Commit patch by shutton closing issue 550