Fixed bugs with challenges