fixed image handling