Clear Issue #72