fixes by mustafa... #5