Adding an extra check for is_deleted