Reverted 'fix' - Just made a whole new more severe issue