Fix for issue #81 and #82