correctly pass timeout and heartbeat options.