Fixed returning images
Merged