fix issue #12