before beautify
fix true ADR & Rabbitoshi Bugs