fix issue #47
fix issue #48