Attempt fix

Revert 2 & attempt fix