fix issue/18