Bug fix for duplicate constant definition