Keep Image type, fix #2