rebuild for Issue #55