fix (enhancement) for issue #92