some fix from nedviga