Fix segmented entry not working