fix issue 6 #1