bugfix for on