Couple fixes for thumbnail issue - problem was still occuring in 1.8.4
Merge pull request #362 from mtwebster/thumbnail-try-again

Couple fixes for thumbnail issue - problem was still occuring in 1.8.4