Yssaril:
	- fix for ticket 19
