fixes by semarie