fixes by pepelsbey