fix issue #52