Fixed issue with destroy getting added twice