Better fix for codeplex issue 8274 (doesn't break LinLog, KK, FR and BoundedFR anymore)