1 bugfix and 1 improvement