Issues with delete fixed