Performance issues with 19.1