Fixed issue with deletion