fix option repo implement new logic