- Replaced Klaus custom callback with standard one