FixDoubleDash Improved