Bug fixed version