Target overflow fix