Submit to Nextiva fix