Fixed some errors associated with the new option