fix issue #14