Added support for original image size