Bug are fixed