Fix for thumbnail issue