Bug fix in if statement when not using a dictionary
Internal changes