fix first call bug