Reverted previous and trying new fix