fix to CouchBeam stable branch