...
bugfix and explanation