John Pasula:
	- Fix for ticket 175 by sidji
