Fixed implementing issue