Fix image call issues