Fix issue on destroy action