Fixes for issue#80

Fix for Issue#80