Issue #246 remove end