This seems to work better (no idea why...)