Bug fixed (delete/update)