Rebuild for Pull #88 Issue #88