fix issue 129