rectified double-click bug and obfuscated