Fixing obfuscation bug