Fixed image handling.