Bug fix & Trash delete