bug fixing by Markus Scholz
_