Added workaround for spec bug mentioned in issue #24.