fix issue #64
fix issue #69