Fix upright=1.15

Need to check whether the prefix option matches before we assume the image
option is a simple one - since some are both!

Change-Id: Ifc249725c138de483c72362608a99cab38ce0e1e