updated for upstream 0.10.9