Fixed so option lists works correctly