Enhanced - Fix