fix issue #573