fixed: properly treat options