Fixed issues in 26.1