Bug fix
100-grade solution