oops fix logic