Fixed some broken code on option