Last bug fix for hint