iss34 bugfix