Fix usecase again