fix issue #560