Patched the Image Issue - #5827