Issue#44 Fix destroy method