Bug fixed (hopefully...)