Added fix for Raster as well as ShapeFile