corrections from wrong commit f54b81e63b33b72024682e335b0035dac3779dc9