Issue 47

fix issue 47