fixed debacle with bounds-checking for non target and non macro lines