Issue78

Fix for issue #78.