XB6 in bridge mode - only getting about 300mb/s down, 10 up

Just recieved my xb6 for my recently upgaraded gig plan.

I used it in bridge mode ( i have a Netgear R8500 router attached)

I noticed that via wifi, i am only getting 300 down and 10 up.

When i disabled bridge mode and connected directly to the 

XB6 wifi, got about 600 and 40.

I know there is a bug with the xb6 in bridge mode.

But is there a fix?