ACF-54: Token generation bug fixed.