Interim commit - bug fix - somewhat tested