Work around until commit  #79 is merged upstread.
Merge pull request #3 from andymcc/upstream_workaround

Work around until commit  #79 is merged upstream