fix issue #440