fix issue #556