Resolve Base 64 images issues