fix issue #558