fix issue #15