handle teamweek returns better, see #15