[BUGFIX] Image check is more accurate