This should fix issue 106