final bug fix-I promise