fix issue #575