Fixing how thumbnail is handle