Fix info option handling