fix issue #500