Initial fix for BigCouch