Updated to remove superfluous double-call.