challenges fixes