fix issue #21