fix issue #15
fix issue #16