[option] address some issues