Fixed dictionary issues