fix issue #07