Rebuild for Issue #72