Changes to avoid obfuscation issues