v4.09 fix for multiple definition error