fix imagehandler, partial