Comment 9 for bug 1244662

I was right, testing with a funky layout still shows errors with your patch, but works with my suggested patch.
Heres a test case (modified version of the first one) that shows that failure.