fix issue 79
issue 79