Hopefully fixed issues with obfuscation