Bug fix for variable kind issues.