Fix for chap-rechallenge stuff