finishing fix for issue #39