Similar bug fix