fix issue #559