fix dictionary issues