This should fix issue 101