fixed citizenship bugs