Sal Scotto:
	- Fix for ticket 150
