Have you started cutting back on fluids in the evening?

Most men try this first. It rarely solves it.