Added ImageHandler bugfix