fixed backporting issues