Merge pull request #286 from jbq/bugfix