Fixed option handling bug