Merge pull request #261 from pcc/fix3