Corected bug fix