fix issue #156