possible fix for challenge / events