Bug Fix: Found at least two lines that 4.2.6 didn't like