Glass material black edges on smooth shading!

Support Lighting and Rendering
1

I have found on many occasions when rendering water, that using the glass material creates horrible black lines at edges of polygons. switching to flat shading solves this but i have to increase my poly count to un-computable baking times… this problem has been bugging me since i first started blender at 2.61.

2

Thanks! much appreciated!