FIX: use correct start ID depending on handshake