better figure option detection