Try to resolve new functionality issues