diff --git a/libretro-common/formats/png/rpng_fbio.c b/libretro-common/formats/png/rpng_fbio.c
index 4a6eb541f2..ccaecb85f6 100644
--- a/libretro-common/formats/png/rpng_fbio.c
+++ b/libretro-common/formats/png/rpng_fbio.c
@@ -160,7 +160,7 @@ bool rpng_load_image_argb_iterate(FILE **fd, struct rpng_t *rpng)
          return false;
 
       case PNG_CHUNK_IHDR:
-         if (rpng->has_ihdr || rpng->has_idat || rpng->has_iend)
+         if (rpng_is_valid(rpng))
             return false;
 
          if (!png_parse_ihdr_fio(fd, &chunk, &rpng->ihdr))
diff --git a/libretro-common/formats/png/rpng_nbio.c b/libretro-common/formats/png/rpng_nbio.c
index 63ed17a89f..e90a0f910a 100644
--- a/libretro-common/formats/png/rpng_nbio.c
+++ b/libretro-common/formats/png/rpng_nbio.c
@@ -249,7 +249,7 @@ bool rpng_nbio_load_image_argb_start(struct rpng_t *rpng)
    return true;
 }
 
-bool rpng_nbio_is_valid(struct rpng_t *rpng)
+bool rpng_is_valid(struct rpng_t *rpng)
 {
    if (rpng->has_ihdr)
       return true;
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
index d4d2342e16..84b0d411b6 100644
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@@ -105,7 +105,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
 
 struct rpng_t *rpng_nbio_load_image_argb_init(const char *path);
 
-bool rpng_nbio_is_valid(struct rpng_t *rpng);
+bool rpng_is_valid(struct rpng_t *rpng);
 
 void rpng_nbio_load_image_free(struct rpng_t *rpng);
 
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index 3c83736256..55c66a27e9 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -185,7 +185,7 @@ static int cb_image_menu_generic(nbio_handle_t *nbio)
    if (!nbio)
       return -1;
 
-   if (!rpng_nbio_is_valid(nbio->image.handle))
+   if (!rpng_is_valid(nbio->image.handle))
       return -1;
 
    retval = rpng_nbio_load_image_argb_process(nbio->image.handle,