Reverted previous fixes