fix issue51
9 files changed