Rebuild for Issue #95 and Issue #96