2025-08-26: Bug fixing