Fix the 31st bug