Fixing naimg issues