Issue: Bug fixing