Fixed issue with delete going crazy