Fix third party issue 22