Issue 79

Fix for issue #79