Fix for static library build