Fixed answer code sometimes not set correctly