Bug fixed (thought I tested before commit though...)