Bug fixed again