fixing for 0.8 + thumbnail