Add C2797 Workaround

Negotiate issue #24