issue #81 fix code