Should be fixed now, my bad merge fail :)