fix major error in logic, add missing option to pass on