fix a critical change address generation bug