Bug fixed '