fix from wiezen