correcting issue #81