Fixing delete issue