Warning bug fix