Adapt to images other than circle #114