#989 - Option ID is appended with _1 although not needed