bugfix: on parameter was filled with values for all combinations possible instead of only the necessary ones