Bug fix - issue 364