Found multiple call bug. Fixing it