[Misc] Better fix