try to fix urgent issue #55