Fix delete issue