merged fix for delete button