Michael Phelps may have disappointed some fans over the weekend, when he lost two races in his first competition since last year’s Olympics.

It was also his first competition since pictures of him apparently smoking pot were published, and since his rumored girlfriend, Carrie Prejean, became embroiled in controversies over her stance on same-sex marriage and semi-nude photographs.

Phelps did win some races at the Charlotte UltraSwim Grand Prix this weekend — the 100m and 200m butterfly — but fell short during the 200m butterfly race, which was won by world-record holder Aaron Peirsol. He also lost the 100m freestyle, which was won by Frenchman Fred Bousquet, according to Reuters.

Despite the losses, the gold-medalist gave himself high marks, and remarked, "For my first meet back I have no complaints. We’re on the right track." He went on, "This is exactly where I want to be, some happy times and like tonight, some pretty frustrating times. But it’s just something that will motivate me to fix those things over the next few weeks." Phelps now begins training for the U.S. Championships in July.