Maybe fix obfuscation issues